Resolve CVS conflicts

diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index bdd4dd030d39c65d657d91390f8cd2e6ec2a7a19..4e9fc24ade11acdaaf3ae4ef1dbc82366c12f6a7 100644 (file)
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -668,6 +668,5 @@ See documentation for variable `ebnf-ebx-lex'."
 
 (provide 'ebnf-ebx)
 
-
-;;; arch-tag:
+;;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
 ;;; ebnf-ebx.el ends here